From f7cd2a782be43dda118487f41456e6c3dc42437d Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 30 Jan 2020 10:43:35 +0100 Subject: [PATCH] Fix warnings in gdk gir build We now have graphene arguments in a gdk function, so add that to the dependencies. --- gtk/meson.build | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gtk/meson.build b/gtk/meson.build index 698235eeec..07f706c51f 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -1008,6 +1008,12 @@ if build_gir # the installed one gdk_gir_inc = [ 'cairo-1.0', 'Gio-2.0', ] + if graphene_dep.type_name() == 'internal' + gdk_gir_inc += subproject('graphene').get_variable('graphene_gir').get(0) + else + gdk_gir_inc += 'Graphene-1.0' + endif + if pixbuf_dep.type_name() == 'internal' gdk_gir_inc += subproject('gdk-pixbuf').get_variable('gdkpixbuf_gir').get(0) else @@ -1052,12 +1058,7 @@ if build_gir gtk_dep_sources += gdk_x11_gir endif - gsk_gir_inc = [ gdk_gir[0], ] - if graphene_dep.type_name() == 'internal' - gsk_gir_inc += subproject('graphene').get_variable('graphene_gir').get(0) - else - gsk_gir_inc += 'Graphene-1.0' - endif + gsk_gir_inc = [ gdk_gir[0] ] gsk_gir = gnome.generate_gir(libgtk, sources: gsk_public_headers + gsk_public_sources + [ gskenum_h ], -- 2.30.2